package com.mooc.gittest

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
//提交代码前先pull拉取服务器最新代码，处理掉本地冲突
//提交代码
//zhang pull push
//li pull push
//pull
class MainActivity : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_main)
        //1234
        //4321
        //1111
        //aaaa
    }
}